Autogenerated HTML docs for v1.8.4.1-600-g3d092
diff --git a/git-config.html b/git-config.html index a0fcf2b..a9dc77b 100644 --- a/git-config.html +++ b/git-config.html
@@ -2384,6 +2384,8 @@ overridden by <code>branch.<name>.pushremote</code>. If no remote is configured, or if you are not on any branch, it defaults to <code>origin</code> for fetching and <code>remote.pushdefault</code> for pushing. + Additionally, <code>.</code> (a period) is the current local repository + (a dot-repository), see <code>branch.<name>.merge</code>'s final note below. </p> </dd> <dt class="hdlist1"> @@ -2419,8 +2421,8 @@ Specify multiple values to get an octopus merge. If you wish to setup <em>git pull</em> so that it merges into <name> from another branch in the local repository, you can point - branch.<name>.merge to the desired branch, and use the special setting - <code>.</code> (a period) for branch.<name>.remote. + branch.<name>.merge to the desired branch, and use the relative path + setting <code>.</code> (a period) for branch.<name>.remote. </p> </dd> <dt class="hdlist1">
